admin: Drop two uses of ostree_sysroot_get_path()

Moving towards it being a full library.

diff --git a/src/ostree/ot-admin-builtin-diff.c b/src/ostree/ot-admin-builtin-diff.c
index 88e3717ec39bb9beb84cb4cf53eb859642415b73..8c543928f835d29290cc43eccbcc610a2999cb94 100644 (file)
--- a/src/ostree/ot-admin-builtin-diff.c
+++ b/src/ostree/ot-admin-builtin-diff.c
@@ -41,7 +41,6 @@ ot_admin_builtin_diff (int argc, char **argv, OstreeSysroot *sysroot, GCancellab
 {
   GOptionContext *context;
   gboolean ret = FALSE;
-  gs_unref_object GFile *repo_path = NULL;
   gs_unref_object OstreeDeployment *deployment = NULL;
   gs_unref_object GFile *deployment_dir = NULL;
   gs_unref_ptrarray GPtrArray *modified = NULL;
@@ -59,8 +58,6 @@ ot_admin_builtin_diff (int argc, char **argv, OstreeSysroot *sysroot, GCancellab
   if (!g_option_context_parse (context, &argc, &argv, error))
     goto out;
   
-  repo_path = g_file_resolve_relative_path (ostree_sysroot_get_path (sysroot), "ostree/repo");
-
   if (!ostree_sysroot_list_deployments (sysroot, &bootversion, &deployments,
                                         cancellable, error))
     {

diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c
index 70204006d234d9f2da3555a117586add9acf2daa..563b14be60d22646f3ed0f66adfb9b9d46f2a1d6 100644 (file)
--- a/src/ostree/ot-admin-builtin-upgrade.c
+++ b/src/ostree/ot-admin-builtin-upgrade.c
@@ -47,7 +47,6 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel
   gboolean ret = FALSE;
   GOptionContext *context;
   gs_unref_object OstreeRepo *repo = NULL;
-  gs_unref_object GFile *repo_path = NULL;
   gs_free char *origin_refspec = NULL;
   gs_free char *origin_remote = NULL;
   gs_free char *origin_ref = NULL;
@@ -90,9 +89,7 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel
   deployment_path = ostree_sysroot_get_deployment_directory (sysroot, merge_deployment);
   deployment_origin_path = ostree_sysroot_get_deployment_origin_path (deployment_path);
 
-  repo_path = g_file_resolve_relative_path (ostree_sysroot_get_path (sysroot), "ostree/repo");
-  repo = ostree_repo_new (repo_path);
-  if (!ostree_repo_open (repo, cancellable, error))
+  if (!ostree_sysroot_get_repo (sysroot, &repo, cancellable, error))
     goto out;
 
   origin = ostree_deployment_get_origin (merge_deployment);